Merge "Snap for 13198286 from a183e2b92c71d86ec7b104c116ef3f4dbcbb523f to sdk-release" into sdk-release