Convert APC to HNI

Summary: fixes #3627

Reviewed By: @ptarjan

Differential Revision: D1531906