Merge changes from topic 'am-608338568dd24535a5feb566bcc48cf7' into oc-dr1-dev-plus-aosp

* changes:
  Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev am: 4f7fd183eb am: 5fd9dd2e74
  Fixed how FillEventHistory is reset and clarified javadoc. am: 2e30c6f371 am: 605f633995