Fix APN issues

Change-Id: Ibf256d4bd19131375b7cd22fe4c3fdb6f6a06d02