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

Change-Id: I445694d99637a95eaf885d7168c9a747f78e4e0c