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

Change-Id: I9813d735626a1d92b5eeebc1b7b6bab445e69ada