Snap for 11541002 from 00766f06e68a69d23f81b02b0ba0eafa3742ef5e to sdk-release

Change-Id: I2ffdd180ded84134f8016a3e6002648a9b420f96