Merge "Actually remove the tests." am: ae33e5ab58
am: e48b3516fd

Change-Id: I64de2173f3ded528a31fcb5f2034d4bd7b904532