Merge "Trace SQLite operations" am: 6fe06606c4
am: 0f13ddfdff

* commit '0f13ddfdffacffe1c8bcce3adba87dd32b0ab92a':
  Trace SQLite operations