Merge "Snap for 7183507 from 732f67ab4d9aba7face2b75d2f0ddfb2cb88d269 to sdk-release" into sdk-release