am 07af2d08: Merge "Use System.nanoTime() for timeouts and durations"

* commit '07af2d08434b9166ec0d127c8b17d1fd550429df':
  Use System.nanoTime() for timeouts and durations