Merge "Snap for 8167433 from 80dfa914617c7e58fa13afc4b8af23063a6cba60 to sdk-release" into sdk-release