Merge "Remove config_demoModePackage resource" into oc-dr1-dev
am: 934a1081fe

Change-Id: I147f242ab2132a01c1e02ac00ac5123fa9a0a20a