Use array for join condition

Change-Id: I52875ebd5fc67e74439faf703b8119fedd70bfc9
Merge "Use array for join condition"