Merge "Snap for 5475808 from c559ff39378c795c9ee1588584a6ade9699380c3 to sdk-release" into sdk-release