Merge "Allow FR in carrier demo mode" into oc-dev