tree 531ddc608080b0c1b2aa1d32a7b2668671d24418
parent d5a4f90fe02e95f01e5a9775ff7e94167b01d8f7
parent 7551a4633705d0f8dac4fdc07274c78ff1dcfca4
author William Hesse <whesse@google.com> 1461070043 +0200
committer William Hesse <whesse@google.com> 1461070043 +0200

Version 1.16.0-dev.5.2

Cherry-pick 810faa31b9397706a73e37738e8b4a87ef23aeb1 to dev
Cherry-pick ef87bb2e40eb0973658955c75a0e97a3a4836cf4 to dev