Align the unexpected tag and the tag mask to make clearer what's going on.  NFCI.
Align the unexpected tag and the tag mask to make clearer what's going
on.  NFCI.

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury