Merge "Fix the bug using wrong TimeUnit" into pi-dev