Merge "Snap for 5735642 from a6e6e6f652ec5da3c07497a130276d5848d229cf to sdk-release" into sdk-release