merge_pr_7237
Bug: 745385 Change-Id: I6592737458f684e65738ca45aa34a58d5e2ed8bd Reviewed-on: https://chromium-review.googlesource.com/647955 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@{#501193}