Cherry-pick of bd79517a.

Change-Id: I87d790c14d68789524df76f63a61fc30a8792e4e
Reviewed-on: https://chromium-review.googlesource.com/190350Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>