Merge "jiri: Transition away from local/remote snapshots."