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

Change-Id: Ie0ff34a0b8a429caa5119c8bbc42de7b24f3b9ce