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

Change-Id: I6c687f7bcb08a67c11d9180daa60db01adbb6806