Snap for 11933108 from 67f1438144186b4f571f04f3ce75f9ec3d313828 to sdk-release

Change-Id: I97b56f9651da1b90da86e889c160c399e44a45c0