Snap for 11541002 from 7f269abab0f27f31b943cb407190550e0f6be3e8 to sdk-release

Change-Id: I1f000dc2c990eb29602460700227c0e59eceb2ee