am 82fa9c46: am b59573cf: Merge change I06fb08c4 into eclair-mr2

Merge commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9'

* commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9':
  Expand db_operation logging to prepare for widespread sample collection: