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

Change-Id: I75374581e5bf4f14eccb581b0895ea204223fa1a