Merge "Snap for 7800789 from 9adec7503b89691aa7e9638525e156516288b433 to sdk-release" into sdk-release