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

* commit 'e8c01ddbe748490463f7f516df9b1b4784228913':
  Changes to PFD based on API review