mergeupstream: Cleanup after merge

Change-Id: I62dfd747cfa6e916031d125a6ea6544f13e6ed07