Co-authored-by: Xing Lin <xinglin@linkedin.com> (cherry picked from commit 98b9c435f24c76e3629f6d8e9c14473b46fe6a0e)