Merge "Fix secondary ABI instrumetion" into nyc-dev