Deflake apexservice_test am: d9ad7f9932 am: 3ad40a6a6e

Change-Id: I5c47f1885eb497db4d02c72cdb5253a79a929740