Patch by Rumeet Dhindsa <rdhindsa@google.com>.

R=jkummerow@chromium.org

Change-Id: Ibff1af58bbdae52c6fb24b3d98d25e52cee0b63c
Reviewed-on: https://chromium-review.googlesource.com/899006
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51096}