Merge "Add config_demoModePackage to symbols" into oc-dr1-dev