Merge "Merge "Fix flaky AnalytisTest by locking in EventRecord" am: 0a390095df am: e90962ff1d am: d96fd15364"