Merge "Snap for 4499105 from 03814c35b8ee0a1284c667556260124d97466b28 to sdk-release" into sdk-release