DO NOT MERGE Put a small sleep back in the start of toolbox top. am: be6c880398  -s ours
am: bc81d3eafb  -s ours

Change-Id: Ia2b0792a29d67ad289e68f9e0fdef0449a4362e1