Snap for 11962796 from 73ac4f5831fdec536553608cc57034a186f4c9fa to sdk-release

Change-Id: Iaa50702c3bbaba2bb2a4f85e4a0f7f7ae268d2dc