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

Change-Id: I649457dd844320fbeb3a33d61ce8813aa0967157