Snap for 9550355 from c6b47f4b3553dc0d1fb4b0caad6afc544ad48a07 to sdk-release

Change-Id: I1c0e17ce14c49f5afb70b7dcddf751204138c6d0