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

Change-Id: I4fcb7b7ffd9ac96fe9fbe3d5f2cde9cd8bc5746f