Merge "Adding APN Settings for Coriolis" am: 7b7f941f80 am: a70784ddbd
am: 435b46b96f

Change-Id: I4ae89beb716007f9f009709f873bdd51ebd6dedb