Merge change If9a8aee5 into eclair

* changes:
  [Issue 2185274] Optimizing queries used by Google Voice