TBR=lgarron@chromium.org
(cherry picked from commit 32d266526d8c245ed486d88ec870bb3964877616)
Bug: 768086
Change-Id: I89023223ff60736a7d51b7b143dd574b68d64fa5
Reviewed-on: https://chromium-review.googlesource.com/719412
Commit-Queue: Lucas Garron <lgarron@chromium.org>
Reviewed-by: Chris Bentzel <cbentzel@chromium.org>
Reviewed-by: Lucas Garron <lgarron@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#509799}
Reviewed-on: https://chromium-review.googlesource.com/729214
Cr-Commit-Position: refs/branch-heads/3239@{#96}
Cr-Branched-From: adb61db19020ed8ecee5e91b1a0ea4c924ae2988-refs/heads/master@{#508578}