Merge "Actually add a cleanspec line." am: d465bb8077
am: 154b706feb

Change-Id: I7f0acbea7493dfdd319b5b0a50216b121306a9cb