Snap for 9550355 from f96aedcdde133d89a59da622f14dde59776c3181 to sdk-release

Change-Id: Id6e961b9bd96362c6e35a75e44c3ca826f3d2d3d