back port 42210 to this branch

BUG=None
TEST=None

Change-Id: I8c23d9d6cb5400263229bed8d7a8b0e702045024
Reviewed-on: https://gerrit.chromium.org/gerrit/43326
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
2 files changed