Snap for 11541002 from 1e651e1ef2b613db2c4b29ae59c1de74cf0222ae to sdk-release

Change-Id: Ifd71f983ada32cc0df1a6387017378eb001b0bf3