Prohibit V3 V2 token intermix for resource in non-default domain (bug 1157430)

Change-Id: Ibe9019684b45651a9679311a3bacdad41b4116f5
Merge "Prohibit V3 V2 token intermix for resource in non-default domain (bug 1157430)"