am c1d4ec95: Merge "Minor object store optimizations."

* commit 'c1d4ec95c9dc69a7373e2eca0e69965e54d9cf03':
  Minor object store optimizations.