Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev
am: 2ecf42f96c

Change-Id: If89b6af0c20e7a42ce1cd6fe31b042f4d7ffdaad