port 87ae05c7 (r40341)

  original commit message:
  Utilize all opportunities to turn leas into adds.

BUG=

Review-Url: https://codereview.chromium.org/2429763002
Cr-Commit-Position: refs/heads/master@{#40386}