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

Change-Id: Ia90b5875ccf5baea70b6d7ae844cf07b8b9dd67c