Merge "Enable presubmit for idmap2_tests"