API: Use the recieved tenant ID

Change-Id: Ib85c74712064dc81c635118afb7dc9a22ed11f61