Merge "Add @jorgegil to freeform and tests owners"