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

Change-Id: Ie0ab32e351c1ccffc396059662fbc94ff62eee35