Snap for 6877830 from 1371f49ea75b4ae5d1dcc06f029728aa9383d7d0 to sdk-release

Change-Id: I52cd545ac8bf4bd3fad7116ec28827fa48368237