am 824b7169: am cbd6a771: am ebbaca93: Merge "Modify O2 APN details"

* commit '824b7169a9edb59cb28d3f3bd6b2612da428f4a6':