Merge "Snap for 4499105 from 754b5f23b7a17658ab16ff9899b4e15de011a465 to sdk-release" into sdk-release