cherries: fix missing commits

Change-Id: If4ba2a56b8afae2768aaa593a062fa84a6412f7f