Merge "Add support for carrier demo mode" into nyc-mr2-dev