Merge "Change Java APIs to use multiple routed devices" into main