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

Change-Id: I3156862d354274f79a47f23c332da1550736c1cf