Merge "Snap for 6877830 from 5459ca43fea3c604928436d3b9d582a8c757a68a to sdk-release" into sdk-release