Merge "Modify APNs for Truphone" am: bfa8cf49b9 am: b047c92c71
am: e86c55cc1c

Change-Id: Idd50c3b66278e8dd115b16bd6c746cf444c09a84