Merge "Add @Nullable annotation where necessary in Rfc822Token"