Merge "Snap for 5475808 from 05d99cea0e0600de497e06b722f5c999f0521afb to sdk-release" into sdk-release