Merge "Re-enable tradefed workaround" into main