Yet another upstream rebase. We also raised this with them and they will
start using merges. Hopefully this is the last one to fix.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>