Merge "Snap for 11754915 from 83a914b543d3d3a3f0572ca49c861f8eddab2942 to sdk-release" into sdk-release