Merge "Change URI for the channel query" into mnc-dev