Merge "Remove references to DeviceHealthTest"