drop upstreamed patches Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com> (cherry picked from commit af9209fb31)
af9209fb31