DO NOT MERGE - Require password to FR in carrier demo mode
am: 22430d5abb

Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774