Merge "Fix compilation error against current Gerrit master"