Merge "Added ownership attribution for test targets" into main