merge_pr_9325
Bug: 745778 Change-Id: I6b81cec9fd69b028b4368e02a5de8bd1dad8bd53 Reviewed-on: https://chromium-review.googlesource.com/896629 Reviewed-by: Hongchan Choi <[email protected]> Commit-Queue: Raymond Toy <[email protected]> Cr-Commit-Position: refs/heads/master@{#534096}