Merge "Fix/Suppress issues for errorprone update" into main