Merge "Test fix so it can be run via atest." into main