Merge "Turn unusual tags into errors"
am: 57d78295ef

Change-Id: Ib676947207aa1c6b6494f0d924ebd40d94c82a64