Snap for 9550355 from 04f72210d59a0acfccbf53f54274790e7560fcd3 to sdk-release

Change-Id: I56e9e9cd273b3435bb8f4e211ef4a7948fbd46f0