Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev