Snap for 11566117 from e7b1675dde1b92d52ec075b0a92829627f2c52a5 to sdk-release

Change-Id: I6da2c19b91679d5862cd290ddd2f48086d29fb4e