am f9e27790: am e8b11328: am f702fa41: Merge change I53c8228b into eclair

Merge commit 'f9e27790ebed44735b28ba23c3f95f21c6f30743'

* commit 'f9e27790ebed44735b28ba23c3f95f21c6f30743':
  Fix type of _id col in SearchableDictionary