Adding tenant token support

Change-Id: I9e6c9453ae6faf3f83e8fff0de809178387defb0