Resolve race condition between @Before conditions

Bug: 159671700
Change-Id: I5c96c32c171b7b539ce0ea799cf45955c2bee670
2 files changed