APN updates

Credit CM

(cherry picked from commit e2884258f25ea1210d31cc5cfd4ac3dc90e7e6fc)