Merge "Modify APNs for Truphone"
am: bfa8cf49b9

Change-Id: Ia75fd991fae4a7bbef27a59aadad61d7f31fe831