am 0e99097b: (-s ours) am 7955d942: am d5e8c3c9: Merge "Fix missing call to setLinkRuntimeCallback() from compat path."

* commit '0e99097b400ccf69d3092bc993e8644be5d50c85':