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