Merge "Snap for 7183507 from 6d10f91a77002b6371ebada491f507ef974ca572 to sdk-release" into sdk-release