Should me more correct/efficient.

Change-Id: I7bf98706d592f1d9e992dc0d28deac3a4ed722ec
Reviewed-on: https://chromium-review.googlesource.com/560151
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487659}