Merge "Revert "Add testHttpEngine_EnableHttpCache""