Merge "Snap for 5925869 from f30a6dc610b884467958afc80237b1e4af6f148a to sdk-release" into sdk-release