Merge "Snap for 5475808 from 3aff98aee837ac4a416498cfa26c8cc903e1226e to sdk-release" into sdk-release