Merge "Tolerate flush/finish test assumption failures."
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 23:26:38 +0000 (23:26 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 25 Jan 2018 23:26:38 +0000 (23:26 +0000)

Trivial merge