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

Change-Id: I6585d866d4a8e2c54783a874d09821dc727e4941