merge_pr_6783
Bug: 699244 Change-Id: I6a4907f4b97b12fb5c55f857b1a8dde21db70cfd Reviewed-on: https://chromium-review.googlesource.com/606208 Reviewed-by: Robert Flack <[email protected]> Commit-Queue: Stephen McGruer <[email protected]> Cr-Commit-Position: refs/heads/master@{#496789}