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

Change-Id: I53b7e747b25eaaa5a7fb9a7fa916d9165d86bc45