am 54576c29: Merge "Fix EventLogTest Flakiness" into gingerbread

* commit '54576c297555e8b04e4af46ff840e20597a3e3ae':
  Fix EventLogTest Flakiness