Merge "Prevent zero startTimes from making call duration excessively long" into nyc-dev