merge_pr_8509
Bug: 717460 Change-Id: I3cb9ddc2eb70f64244669853fb9f3fc5b6b06a26 Reviewed-on: https://chromium-review.googlesource.com/798270 Reviewed-by: Darren Shen <[email protected]> Commit-Queue: Rune Lillesveen <[email protected]> Cr-Commit-Position: refs/heads/master@{#520327}