Snap for 12349386 from dae5fb0729cc7bd7ce8ca507d6aee323e40d7b5a to sdk-release

Change-Id: Ic7e095b90df0c6aa3fa4f8d126ad358bb65ce48c