merge_pr_8013
Bug: 738769 Change-Id: I8e15f7c05d64a98e6fdd7e3b69e2047902e04aad Reviewed-on: https://chromium-review.googlesource.com/694723 Reviewed-by: Kinuko Yasuda <[email protected]> Commit-Queue: Hiroki Nakagawa <[email protected]> Cr-Commit-Position: refs/heads/master@{#512768}