Merge change 9692

* changes:
  Bootstrap the ever-backed-up bookkeeping properly