Merge "Snap for 6533464 from e174f92c3a3c06bf30ccd715d0e349240a5532ae to sdk-release" into sdk-release