Merge "Merge "Require password to FR in carrier demo mode""