Merge "Snap for 6877830 from 81cfc612a8376f7515b3ca7ccbf89dd2b7fac09b to sdk-release" into sdk-release