Merge "Adding nullability annotation."