Merge "Snap for 6405781 from d82fd8a9ec4fa873c4f298d71181eb12bfdb2f75 to sdk-release" into sdk-release