Merge "Fix order of blocking calls on FillEventHistoryTest." into pi-dev