Disallow cross tenant references

Change-Id: I2bb48e5f51529f9b1f6ad842d01c235d3d35ebe6
Closes-Bug: 1386146
Merge "Disallow cross tenant references"