APN updates from CM

Change-Id: I9cc0e126c626eb5725830188ccf43ae192b5c8ac