Merge "Update FastTrack channel conversion check" into mnc-dev