Fixing tenant cleanup in behavior

Change-Id: I5bd6b58106dd4a13aa576b3068b0306c2e94a52a
Merge "Fixing tenant cleanup in behavior"