Merge "Simplify sleep() and fix overflow bug" am: a99055f74e

Change-Id: Iac8cb79a9b2db81bbcc99a90b8f090c7365067d4