Merge "Add new atoms to track user journeys, such as user switches." into...
Merge "Add new atoms to track user journeys, such as user switches." into rvc-dev am: 58df2202 am: 5bd5e961 am: c3d6fc5d
Change-Id: Id0b4bacab872749919228987f039041795552dfd