Merge "Fix @NonNull -> Nullable for Intent.replaceExtras()."