Merge "Add a protocol property to the APNs and use it." into gingerbread