tree ac775cf6edf1e9d6193f7ddb6c7f5067f3de9e53
parent f12284ca12b9076dcc86f1524fefd57a7318ee52
parent c77f36e72b3d913a80587cf53356b818aa1f2e9e
author Alexander Thomas <athom@google.com> 1589202402 +0200
committer Alexander Thomas <athom@google.com> 1589202402 +0200

Version 2.8.2

* Cherry-pick 86010dbe98193590f3b583366a5c9d7332b6a423 to stable
* Cherry-pick 33056425aff7c3bfff29410b4490ea2eec6c3e34 to stable