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