Merge "Use apn id which contains default type when merging apns" into mnc-dev
Thierry Strudel [Wed, 29 Jul 2015 21:41:55 +0000 (21:41 +0000)]

Trivial merge