Merge "DO NOT MERGE Put a small sleep back in the start of toolbox top." into nyc-mr2-dev
am: 816d6a4228

Change-Id: Ic162d1921bbf9c71ba2e4dea535dd4205b62d17c