am 22d6a52e: Merge change If9a8aee5 into eclair

Merge commit '22d6a52eace0dab1e6a570bbfeb2b49c2858214f' into eclair-mr2

* commit '22d6a52eace0dab1e6a570bbfeb2b49c2858214f':
  [Issue 2185274] Optimizing queries used by Google Voice