Retry #2908 hash update (#2909)

Same commit as before; should work now since the root cause of the prod
CI RBE build failures (outdated mirror) has been resolved.
24 files changed