Snap for 8952093 from a1f37d7e15e391e1973053f8d58f07e4d240f1b4 to sdk-release

Change-Id: I8ab0cbe64553d58f89e08c04220c5039e423484e