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

Change-Id: Ife88baae37aaa1442763dfdbf869fe10ccc093de