Merge "Snap for 5590969 from 032d5f742b66f1acc618889d008bdd3948822da7 to sdk-release" into sdk-release