tree 3796df1000c665fd2d0f17cde538c2e3c5d4aca3
parent 65376c07234d1df472662d21dff2498ab2d3cdda
parent ad01a07a3acd551a6fd26fc4280421814302468f
author Alexander Thomas <athom@google.com> 1618390959 +0200
committer Alexander Thomas <athom@google.com> 1618390959 +0200

Version 2.12.3

* Cherry-pick ce5a1c2392debce967415d4c09359ff2555e3588 to stable
* Cherry-pick adc36a6563614a7c3ba29d9911e57fc68e7d9ac0 to stable