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