Merge "Remove config_demoModePackage resource" into oc-dr1-dev