Snap for 9550355 from 37c00ecdec1515158469267bee49fb202ad9042d to sdk-release

Change-Id: Iaaa2ea15a405253c8630e358706c57c283aefed1