Merge "Snap for 6877830 from 9fe8196b569212520ab8e45a94d6a77e22dbdaeb to sdk-release" into sdk-release