merge_pr_7044
Bug: 745385 Change-Id: Iee758c5cffa37a4070b7b90d5e522c7079ae696c Reviewed-on: https://chromium-review.googlesource.com/642630 Commit-Queue: Austin James Ahlstrom <[email protected]> Reviewed-by: Takeshi Yoshino <[email protected]> Reviewed-by: Yutaka Hirano <[email protected]> Cr-Commit-Position: refs/heads/master@{#498758}