Merge "Fix flaky AnalytisTest by locking in EventRecord"