Merge "[Feature sync] Resolve class-level nullness suppression"