APN updates

Credit CM
Merge remote-tracking branch 'vendorPA/jb43-legacy' into jb43-legacy