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

Change-Id: I6bda3fb8b8eee7f19d40eb57a00f2df0106f3a17