APN updates

Credit CM
Merge remote-tracking branch 'upstream/jb43-legacy' into jb43-leg-alt