Merge "Revert "Add API for cross device calling.""