tree a1e05693ea8b580355132904ec5bffb3e74a1b39
parent 3d951ed90c9e9c1344727c077149fe5f69da2d01
parent 44f52635581e2c50f25c38949bb839faa508d6ca
author William Hesse <whesse@google.com> 1513174002 +0100
committer William Hesse <whesse@google.com> 1513174002 +0100

Version 1.24.3

Cherry-pick 0af5298845574517862e0a4cfabace1488ec2196 to stable
Cherry-pick 644862bf966e6c079460258807ab3364b7e3759a to stable
Cherry-pick 0e164c043f1007e8b3124a152ac9783f821e038c to stable
Cherry-pick 9cf7ba4f842a126b581eeac0197c269a204ecd78 to stable