Merge "Change sleep to nanosleep to avoid failures."
am: 6a084834f0

Change-Id: I86744421077d46eb3172d402690f946fc9de7c97