Merge "Fix nullness annotation"