BUG=705865

Change-Id: Ife59aaf009365a51b5362a00373d1efaceba9fb8
Reviewed-on: https://chromium-review.googlesource.com/490946
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>