Merge "Snap for 5925869 from e900f41152f72092b1e38327fce5e507fd116302 to sdk-release" into sdk-release