In the unit test runner, we should be using TestBlobCache everywhere
Fix bogus Google URL
Merge remote-tracking branch 'upstream/master'