tree afb621ab9ed1bf9fbb3b066ec9c8a22eec7d8ca2
parent e2d59e7f3770ef0cc66a46a0d4f1ec618a3327c0
parent 510c114208291c9c4369a0c61b8b8bb47b439f40
author William Hesse <whesse@google.com> 1460967342 +0200
committer William Hesse <whesse@google.com> 1460967342 +0200

Version 1.16.0-dev.5.1

Cherry-pick 4bed72be27baace2473553dc282a847679191dfe to dev
Cherry-pick bcd8ef3dea0caffa6a715191cc937fe48076dc81 to dev