Merge "Add Nullable annotation"