Bug 2040: Reduce delays.

Change-Id: I7b722f3a2c9bd9a458cdc0296d2eab04feda9d49
Signed-off-by: Alex Fan <railor33@gmail.com>