Update gerrit cherry-picks