Snap for 11541002 from ed7b0637fb8028f250d0e4016f5c40702376ac84 to sdk-release

Change-Id: Idabe6faa7db1ce896cd7836dcac6eb1b90105658