Merge "Snap for 5949240 from a870fb0afa5b33c788fc361e32389a6659a58474 to sdk-release" into sdk-release