merge_pr_7067
Bug: 745385 Change-Id: I4f66282879b301c8dcd02bb94f3d1f76fc246b7e Reviewed-on: https://chromium-review.googlesource.com/645005 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@{#500845}