am 07997865: am c1d4ec95: Merge "Minor object store optimizations."

* commit '07997865b26f3a7e7fa5f673abd94101f99159fa':
  Minor object store optimizations.