Merge "Remove inconsistent usage of macros that broke Thread.sleep/wait on host"