Merge "Snap for 11812660 from 81051f9fb306bce26a4516f25ebd625a08c4b17a to sdk-release" into sdk-release