Snap for 8023979 from c87ba11f4749b77e02ad6c5b68910110fcce8bb2 to sdk-release

Change-Id: Ib01cba3b3142aeefc804c9b7cc16db971a4ece5e