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

Change-Id: Ie370df2604045883fc055bbac570789c55b19d36