Snap for 8047209 from 4e81cd9cc2fd5700fad778754c7db0b34f9fe04f to sdk-release

Change-Id: Ib4fa65121a84718f193c18cf9d9494c60b3d6096