Merge "Actually remove the tests."
am: ae33e5ab58

Change-Id: Ie04fc56d546864168df556db94ab60e14083ad23