am fa14d824: Merge "Move and rename user activity event type constants." into jb-mr1-dev

* commit 'fa14d824d235c33b137a429c3eb6818f273407ab':
  Move and rename user activity event type constants.