Merge "Fix DoubleBraceInitialization errorprone issues" into main