(cherry picked from commit f30ec9a9e6954de9db7788cee22d5c482ecfb934)
From: @yufihyou Reviewed-by: @wenwj0 Signed-off-by: @wenwj0