merge_pr_6724
Bug: 699244 Change-Id: Iab42a2b1363fd3a55ae3bb77e0452157dc66ef89 Reviewed-on: https://chromium-review.googlesource.com/598708 Cr-Commit-Position: refs/heads/master@{#491726} WPT-Export-Revision: 5f2bd2cdabeb9f84151bef014ce198827cde94e9