BUG=829047

Change-Id: I3ff5012311bac36cef7636030e988143f47c3339
Reviewed-on: https://chromium-review.googlesource.com/996471Reviewed-by: Gary Kacmarcik <garykac@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548220}