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