Merge "Snap for 7110675 from d39c3ee7665d9e6d65166e77d675a878a92b191e to sdk-release" into sdk-release