Snap for 8782634 from 6dc064a91ed864cd50d1b0398cae04fb06fffe2b to sdk-release

Change-Id: Iebba64115a1133ccff19882df075281758f2d0cd