Snap for 10929834 from a8b1a0d7e94052985a76ad199fe14d62a5cae01c to sdk-release

Change-Id: I72b840eb2e15a1504038316196eb3358750fc2eb