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

Change-Id: I77c96920c79eebd880db20cb7785c52f714be785