Merge "Move tag definitions into policy"
am: 3200c0bcb8

Change-Id: I64c8ac2e104c025ee3f4aed88d03e6c9aa9bcabe