Merge "Snap for 10929834 from 8b9a3d4e72d589e3ca765313a55cf244263d43e1 to sdk-release" into sdk-release