Merge "Snap for 6660490 from f20360908a5653be4826678cd2b8b471ca98588d to sdk-release" into sdk-release