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

Change-Id: I66917e2ee500321dd1fb82930d152aa59aed620b