Merge "Add multi-interface support to native calls"