Snap for 9550355 from 17b3d228f41ac9ea43e4e6521bf4b51b9ec00fbf to sdk-release

Change-Id: I85536843e021de1db592d43861f43bbac5f4bab1