Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev