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

* commit 'cbd6a77106ac5890a4f1bc506b4eff721de8b6af':