Merge "Extend sleep for racy run-test 063."
am: c9d88538d7

Change-Id: I61eddc71da8c81023a809972a0fba98af5d0c4fa