Port 663b55aa

R=gdeepti@chromium.org, joransiu@ca.ibm.com, jbarboza@ca.ibm.com
BUG=
LOG=N

Change-Id: Ia8cfa8c0927915c4afa07ceac85140231c415a9b
Reviewed-on: https://chromium-review.googlesource.com/820196Reviewed-by: Deepti Gandluri <gdeepti@chromium.org>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#50016}