DO NOT MERGE - Allow FR in carrier demo mode am: bb6859ca75
am: ff43d8f3b7  -s ours

Change-Id: I416b536cca27965db44c4154db580651699588e8