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

Change-Id: I5218711a3cc5b9e1e92071e85208d1b189b810df