Snap for 9550355 from c0314349dc9f9ccaf9300a39b592af478dc497e9 to sdk-release

Change-Id: I6d1ed7562289c39f50cd5e4d22678de9a13ea347