Merge "Remove old configuration values for demo mode" into oc-dr1-dev am: e1132b4a39
am: 5474ddb490

Change-Id: Ia57323ec199279e1dc98609e6aa93d4e4b89ea44