Snap for 11962796 from 6d444b1269618d37e0a83da3c85f15d3b2a19aad to sdk-release

Change-Id: Iade199565bfc9bb476ba2fdb0df3b05b6d9b45db