Merge "Snap for 13198286 from 156b4c68e078f2a049b0e6b5c3822b4965b060ca to sdk-release" into sdk-release