tree 82cb10117c9bbbecdbd14925ad44197a75620fef
parent 4bd009581cc4cae4f891371d170643f02e16ddac
parent 299c1c235b18f9c833cf0d81516f2014049e1499
author William Hesse <whesse@google.com> 1486406750 +0100
committer William Hesse <whesse@google.com> 1486406750 +0100

Version 1.22.0-dev.10.4

Cherry-pick 955a45b06ed7c512142ec4979f24ffd64b5eaa0b into dev
Cherry-pick 167107e94c7b02272f1e316d4d06c9c66b9a6bbe into dev