R=bjaideep@ca.ibm.com, joransiu@ca.ibm.com

Bug: 
Change-Id: I78ec5f187559901dd4703d0964cd0c05726cd2b9
Reviewed-on: https://chromium-review.googlesource.com/553057Reviewed-by: Jaideep Bajwa <bjaideep@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#46299}