am ea9f79f0: am 94d4017b: am f618d720: Merge "Revert "Modify O2 APN details""

* commit 'ea9f79f078c2af93c8b52b08f494e67943c1995b':