Updates for upstream gerrit