Merge "Idmap2: Disable tidy errors"