BUG=668526

Change-Id: Id49f1c1394a72880410eb06ba7356307fff7e8c5
Reviewed-on: https://chromium-review.googlesource.com/414496
Commit-Queue: Mike Stipicevic <stip@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>