Merge "Use sleep instead of yield."
am: 97acd8ad91

Change-Id: I9a38294d31b00b68e11f394560aaa4af5919f253