Merge "Fix CTS tests to reflect API changes in PFD" into klp-dev