(no-ticket) Zeus fetcher improvements.

Change-Id: I3aec85c2183c994e5fc44456ca21decef5d67cb9
Merge "(no-ticket) Zeus fetcher improvements."