am e5e2c9e9: am d040d095: am 2777fe95: Merge "Modify O2 APN details"

* commit 'e5e2c9e9bb20745f7dced45a910dd3cc59906655':