am 18dd9b94: Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev

* commit '18dd9b94150bf8960314aa52f2f05e31fd9a7432':
  Use enabled/enabledSetting from PackageParser.