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

Change-Id: I380f966be34cdc1f94e38252cd5215b77c9b2b7f