handle stale patch sets

Change-Id: Ie15229b163a03968a0994e8585d42881e79fd897