Merge "Revert "apns: Add type default for Sprint."" into cm-11.0