am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev

* commit '0ccef4d00357275f3a492e10f4e88aaf4d9deec6':
  Apply implicit parent dependency when adding to PreferenceGroup