am 7db0d041: Merge "Add multi-interface support to native calls"

* commit '7db0d0411266e29302aadfe1f64209628c586a93':
  Add multi-interface support to native calls