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

Change-Id: Ibd7dccb0cf18bd44115e914b2cf16861c38e50fb