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

Change-Id: Ie72b5b3153ca45258b6f341763b62ea0b84f4353