merge_pr_7234
Bug: 745385 Change-Id: I5a70b0b71dc56c74c9786892e87befedb5b3a6a6 Reviewed-on: https://chromium-review.googlesource.com/648906 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@{#501186}