Merge "Specify the time units for waitForActivityWithTimeout"