BUG=722573
R=scottmg@chromium.org

Change-Id: I55d17ae0e4de6ccd5a7a674a52a9948bdafc915b
Reviewed-on: https://chromium-review.googlesource.com/1016283Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551733}