Merge "Fix gerrit-mvn job errors"