Merge "Fix the bug using wrong TimeUnit" into pi-dev
am: 10280a53b0

Change-Id: I8d90eec324ddfcb0123247e2e0e37aa6f6f94ab8