(cherry picked from commit 854f4ad6)

Additionally fixed unit test, searching backward shall not produce a
different result from searching forward. (erAck)

Change-Id: I952509276875441005e6a4036e6c3089be627dd9