Snap for 11541002 from bd84bab4bd1a12d933240645215946ee9e651b29 to sdk-release

Change-Id: Iae556368a9d9897d4e3b7b4b7f23339fbe9c86a0