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

Change-Id: I39be25f3cb506b47ffc7905f4700c5fa606dd0d8