Merge "Snap for 5590969 from 249005644250a0267ed1ac77908ad7234be4bb2f to sdk-release" into sdk-release