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

Change-Id: I75cf8daf594f2bff3acfb7ac7cb7992c578a62b7