Snap for 10929834 from 86b1768168c91239ef11b922794fee20192cf9d9 to sdk-release

Change-Id: I56f8b6e897f83dff95c369dbaa1de4d05e27d10b