am 6f9c87ed: am 45339b01: Merge "Use consistent search depth."

* commit '6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
  Use consistent search depth.