Signed-off-by: Xiaolin Ha <haxiaolin@apache.org> Signed-off-by: Nick Dimiduk <ndimiduk@apache.org> (cherry picked from commit 487cf301a46a5df9201d24f19117b79967082b73)