Merge "Reenable test for presubmit"