Fixed how FillEventHistory is reset and clarified javadoc. am: 2e30c6f371
am: 9cd1c52867

Change-Id: Ida68112cd418e241b95ce3c65b37169b9098c053