Snap for 11541002 from 76c2f84d5e0861ca0d7c181fdf757c314042503b to sdk-release

Change-Id: Iafec1ff99711b6ea72109daa6d574b85338d1ad8