Merge "Revert "Disable failing test to unblock presubmit""