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

* commit '768c5c4d9d736c55d7ef580142d602850f47a098':
  Use enabled/enabledSetting from PackageParser.