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

Change-Id: Iceb6723dc46305c19da98d8f542633e0c7c17f16