tree 08225e327d16b7d12c1f68e3c5a10c4158af4809
parent 381fc833ac9e6ea58762b7e7ac8b7f2129e8477f
author tsepez <tsepez@chromium.org> 1476135065 -0700
committer Commit bot <commit-bot@chromium.org> 1476135065 -0700

Land all the fixes from 5609f39c but don't enable assert

Split this off so that we don't keep losing this when
the assert is reverted again.

Review-Url: https://codereview.chromium.org/2401423005