R=nednguyen@chromium.org

Bug: 842232
Change-Id: Iacafeec6abed7d36ef2a2cb06c0bd7919f9eab94
Reviewed-on: https://chromium-review.googlesource.com/1055730Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Charlie Andrews <charliea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557926}