Merge "Patch for awaitNanos() for coarse-grained clocks"