Merge "Update nullness annotations"