Add tenant_id to where clause.

Change-Id: I8008675db513e9940911038628cc495321619361