am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"

* commit 'e321d06430304fa93282c765aa6070c908121a16':
  Adding a sanity test in the while loop in readHistory()