Merge "Prevent setStartTimeUs from integer overflow"