BUG=540829

Change-Id: I3595f316afa1897224ad95d6f9a3da3685aa0831
Reviewed-on: https://chromium-review.googlesource.com/324032
Tryjob-Request: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>