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

Change-Id: I9e26a191ce5aff6a2ae698fbdd3cbdccfc90a4cd