DO NOT MERGE - Require password to FR in carrier demo mode
am: 319b44e6e9

Change-Id: Ie53a29cfc067f255f2f90e5d83ec8d92a57a3651