Merge "Snap for 6259218 from 33446315ab20da709355666b4f539a1791b5a97e to sdk-release" into sdk-release