Merge "Remove TODO(b/347672184) and explain why @Nullable is not used" into main