Merge "APF: add debug code." into nyc-dev
am: 6b7c9ec

* commit '6b7c9ec19cc96db2a1bf02fa769b3a67d8c5aada':
  APF: add debug code.