Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev