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

Change-Id: I1c67594551994e0aef25472932c6f63b0b083825