Merge commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4' * commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4': Fix setting of the APN type.
Merge commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4' * commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4': Fix setting of the APN type.