Merge "Remove tests in CleanSpec." am: fb5e6487e2
am: f83175c384

Change-Id: I8d838100f5de9b16d2daea48f2bb2c5d559230b9