Snap for 11541002 from e13194474f9b0035ae014b3193027641ae2d48fb to sdk-release

Change-Id: I69bb768f0950b61bf5b22827cf666f41bf3bd6dc