Merge "Default to erroring when eng/debug tags are used"