Merge "Snap for 6877830 from 1057296cf7d4af15eb504ffdf6a1791aca1dce7b to sdk-release" into sdk-release