Version 4.3.61.23 (cherry-pick)

Fix smi scanning

BUG=chromium:483176
LOG=N
R=ishell@chromium.org, rossberg@chromium.org

Review URL: https://codereview.chromium.org/1149643003

Cr-Commit-Position: refs/branch-heads/4.3@{#27}
Cr-Branched-From: f5c0a23a-refs/heads/4.3.61@{#1}
Cr-Branched-From: 0a7d4f49-refs/heads/master@{#27508}