Merge "Fail the build when using a user tag on a non-legacy module."