tree 4cc5bb459139b806114159c96814299779257582
parent 9d056cd16af996cab79cc98fa933aeeb09c48785
parent 58c8caeffe08e80d656f6f5bffc20224dcd4abf5
author William Hesse <whesse@google.com> 1468840758 +0200
committer William Hesse <whesse@google.com> 1468840758 +0200

Version 1.18.0-dev.4.2

Cherry-pick 4bfdaa83b2c5c6f90f410e7eea4729f8f65d3440 into dev
Cherry-pick 7af8d6e5a4f981e06a29e28db180ca4badd2f0f9 into dev