Merge "Fix incompatibility with gerrit 2.8"