am cd38fdb2: am 59bbba7c: Merge "Add implicit parent dependency for Preferences" into klp-dev

* commit 'cd38fdb2de55f666f6c268549d3f5bdced616fda':
  Add implicit parent dependency for Preferences