merge_pr_7232
Bug: 745385 Change-Id: Iea2049e1012303d0655d514a6ba4b1406acfbc41 Reviewed-on: https://chromium-review.googlesource.com/644673 Reviewed-by: Yutaka Hirano <[email protected]> Reviewed-by: Takeshi Yoshino <[email protected]> Commit-Queue: Austin James Ahlstrom <[email protected]> Cr-Commit-Position: refs/heads/master@{#501164}