am d40bdd8f: Merge "Fixup tethering APNs" into jb-dev

* commit 'd40bdd8f2d75e70ada27805efef7c3fa48a18bd7':
  Fixup tethering APNs