Merge "Add new configuration values for demo mode" into oc-dr1-dev
am: f2dc5c69a4

Change-Id: I84a07c360044384b397767c29ac3751060c60900