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

Change-Id: I1e08211ccc567560905a72dee85b1b2f05b3440b