BUG=781164

Change-Id: I92738c0f45efdf0efaecede509648fd5a4d00b8b
Reviewed-on: https://chromium-review.googlesource.com/786338
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>