Merge "When restoring APNs, getApns takes a subId arg"