R=dnj@chromium.org

Bug: 754427
Change-Id: Ieea8b3e46b9bb799bd42a29e4c0c791f7d846b22
Reviewed-on: https://chromium-review.googlesource.com/611482Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>