Merge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev
am: cc1379bfea

Change-Id: I49c818af2a1f966c60f7ba184cf50fcfcae788ad