Merge "Checks that secondary instrumentation ABI matches" into pi-dev