merge_pr_9789
Bug: 813452 Change-Id: I31e68cd13b258516db7eac83fc5e8758d3912f51 Reviewed-on: https://chromium-review.googlesource.com/946908 Reviewed-by: Yoav Weiss <[email protected]> Commit-Queue: Kouhei Ueno <[email protected]> Cr-Commit-Position: refs/heads/master@{#540749}