Merge \"Disallow safe boot when in demo mode\" into nyc-mr1-dev
am: f61eb922f9

Change-Id: I2a8afd796453633cab0fbb0803c4c34a61ac3657