Snap for 11541002 from f0da172c5927a86b1a290829cf55aca283119fdf to sdk-release

Change-Id: I649e17657847bd90d0a9077cd5b32c8b2ccbf9e8