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

Change-Id: I62d195bcc9f8ba5287ea32ade7c20a0e6947ba31