cherries: remove merged

Change-Id: Ie3c83597170edf48c5d60345202ad8c9390c4348