Adding tenant token support objects

Change-Id: I1eb342beb11080d3c75c616a4adfcf9a78cf3828
Merge "Adding tenant token support objects"