Merge \\"Use sleep instead of sched_yield.\\" am: 5a9ecac3c9
am: ce040150fc

Change-Id: I4227b6bc3ab39fdab5578d4689deaf6cb6b45202