Merge "Snap for 6198741 from 134394962fc46d68fc8f295aed23c932a59c67a4 to sdk-release" into sdk-release