Merge "Fix PHPDoc for getTimeAndDelay()"