Merge "Make chips less fragile for testing purposes."