Merge "Snap for 11812660 from 21592eede99a6c0c446aff0f5e8dd7380a2adca2 to sdk-release" into sdk-release