Merge v6.16.4

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>