add my gerrit cherry-picks, edit instructions a bit