Merge "Snap for 8952093 from c90fe3d1e4f69b3aebd24764868797e76f12dba4 to sdk-release" into sdk-release