Merge \\"Use usleep instead of sleep(0).\\" am: 04110b5f86
am: e47a63a931

Change-Id: I6b1d8fb02e43e8c4709179a462b152c853990525