Merge pull request #12677 from ctiller/flowctl+millis

Roll-up: Flow control changes, and internal timing changes