Snap for 11541002 from f8004be3f52af830f709a09af1b2f7e041f717a2 to sdk-release

Change-Id: Id04b0754437a4673c5c142301b77ea6f88be244e