APN updates from CM

Change-Id: I9cc0e126c626eb5725830188ccf43ae192b5c8ac
(cherry picked from commit c631c0d21ca05db44f65d709651cd73b488bce0c)