Merge "Snap for 7183507 from 582ed1ba809b2b8d1016f792b6bc5f0cfed82a4d to sdk-release" into sdk-release