Fixed how FillEventHistory is reset and clarified javadoc. am: 2e30c6f371 am: 605f633995
am: 29790af8b1

Change-Id: I1895b57781d7e9b4dd79c99a4fb880f98ba58ba8