Snap for 9550355 from 430872bd0769d04a4a3fe6607ed75128f1b011f9 to sdk-release

Change-Id: I41a193362046578bc2f636e843b5e4a0b99cc0f7