Merge "Add support for carrier demo mode"