R=mstarzinger@chromium.org

Change-Id: I77356a84a89ff94dc5516e3507e11d0b5c429107
Reviewed-on: https://chromium-review.googlesource.com/951927Reviewed-by: Eric Holk <eholk@chromium.org>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#51778}