Reviewer AMC: Add PCFA headers based on charging addresses from HSS

Hi Andy,

Please can you review the sprout work for story 851?

There aren't UTs for the cases that are optionally specced because a) they're virtually no-ops and b) it's not that easy to UT them. We can discuss if you think it's a problem.

NOt yet tested live.

Thanks.