This includes two bug fixes. BUG=419060,427266 Review URL: https://codereview.chromium.org/705193002 Cr-Commit-Position: refs/heads/master@{#303160}