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