Snap for 8952093 from e7dbbc7d8bc5871f29792d9cfa7b1818dbd157af to sdk-release

Change-Id: Ica17fa5ff1fd2b40b10f80649895e971a7b2527d