am 1ca94798: Fix build: HistoryRecord is now ActivityRecord

Merge commit '1ca94798ccd3a9b20f7824231cfb1f5fdf6bc719'

* commit '1ca94798ccd3a9b20f7824231cfb1f5fdf6bc719':
  Fix build: HistoryRecord is now ActivityRecord