Merge "[automerger skipped] Merge "Used APN type instead of APN id" am: 2e371c1b5a am: a916542011 am: 8f76322f75  -s ours"