Merge "Snap for 4499105 from e77a21767e61612de6689d5a480587dbb1ad5dff to sdk-release" into sdk-release