Merge "Snap for 6686656 from 197f13f7a0bdd4c7274032197329eac70d99bb61 to sdk-release" into sdk-release