APN updates

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