Snap for 11541002 from 43ed01aceb08b2ab661b4fb50b9a5fe145012d4b to sdk-release

Change-Id: I3fbd15f042a5d3964ad5c020c4a39b61cad0d2c0