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

Change-Id: Ic732077be5b207c7b7b4fb0468ccf273333d9ceb