Merge "Fix nullness annotations"