Merge "Support atom-level annotations within AStatsEvent" into rvc-dev