Merge "Allow DeviceProfile tests to run on TreeHugger Robolectric device" into main