Merge "Fix timestamp overflow issues"
authorYue Chen <yuec@google.com>
Tue, 18 Jun 2019 23:39:09 +0000 (23:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 18 Jun 2019 23:39:09 +0000 (23:39 +0000)

Trivial merge