Merge "StatsEvent annotations java autogen" into rvc-dev