am a6f2a7e0: Merge "Fix NanoSleep and add test"

* commit 'a6f2a7e01433926339866afc2b413770774c6d9f':
  Fix NanoSleep and add test