Merge "Remove tests in CleanSpec."
am: fb5e6487e2

Change-Id: I4add7034d78d2a35ff94b3db9b8bc6b615d6c34b