Snap for 13198286 from d8ee8eb2e47497cf3684e1ecc11868d77162ee4f to sdk-release Change-Id: I7d7067014b8f2b7c412b5d43d56b365be88ef16c