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

Change-Id: I743912e1b75f1490656275ce28a47200ed7dadb7