Merge "update Orange SP apn" am: e0587f2a3e
am: f9e8c011a2

Change-Id: I575ef5c2b4ddcf38a9f21bbede33152f9537e71e