Avoid extra HEADs for stash clearing

Change-Id: I96e78b219fe12b43daf4a313eb297b98577ef955
Merge "Avoid extra HEADs for stash clearing"