merge_pr_9176
Bug: 695939, 805348 Change-Id: I6c0e1643b70a94e37261ef709d58da13fa9b6cdd Reviewed-on: https://chromium-review.googlesource.com/883063 Commit-Queue: Yutaka Hirano <[email protected]> Reviewed-by: Takeshi Yoshino <[email protected]> Cr-Commit-Position: refs/heads/master@{#531524}