Merge "Clean up Japanese APNs" into cm-11.0