am 2f9fd33f: am e8c01ddb: Merge "Changes to PFD based on API review" into klp-dev

* commit '2f9fd33fd9cad3bbd8edffefa9c65cbeb7e50c94':
  Changes to PFD based on API review