Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode"