Merge "Remove whitespaces from apn type parameters" into cm-10.1