am 547a88fb: Merge "Update APNs for emerging markets." into klp-dev

* commit '547a88fb88805c1a0d14d7ef082a10ca02d66d65':
  Update APNs for emerging markets.