Merge "Snap for 6686656 from 760e8921c22c0185bc68f8a9884f0e8ddb7a25a4 to sdk-release" into sdk-release