Merge "objectcache: Complete code coverage for HashBagOStuff"