Merge "Fix Nullability annotation"