Merge "Shorten sleep for racy run-test 063."
am: 4d545f2e70

Change-Id: I350a8b6444d705d0cd0ea9556bd8e32035a7beb4