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

Change-Id: I3b003e10710019df61b8f96f9ff6781ee7da48db