Merge "Snap for 4794708 from 4d492393733cfae4dd97fbc8971207905b37ff75 to sdk-release" into sdk-release