Merge "Revert "Remove failure test that broke presubmit and build""