am 72a52e7b: Merge "Removed a loop for buffer lookup"

* commit '72a52e7bb77efb6132e0ba81a0e19fb19af1c678':
  Removed a loop for buffer lookup