tree f7f38cc10aaaf5456c889b48b14b645046e4b9f3
parent 3cb71351e4fd1062a55cfb8a859640f283b8f2d1
parent acae564d67a30d908c21545fafc179c1e6d9600d
author William Hesse <whesse@google.com> 1461590860 +0200
committer William Hesse <whesse@google.com> 1461590860 +0200

Version 1.16.0-dev.5.5

Cherry-pick e8fd9f5c1f9f3e5df1265cf762ceac5170c40621 to dev
Cherry-pick 8f7b8a9d87d63ff164cdeee1be64104b648d8056 to dev
Cherry-pick cf59fdfabd77924e542954d6cb0ecd6d88272f99 to dev