Merge "Snap for 7800789 from c91d67126471be75259170daaf9930900222d610 to sdk-release" into sdk-release