cherry picked from commit d0b896a7495b71313c43aff4329714ade56799d4

Signed-off-by: Kostiantyn Kostiuk konstantin@daynix.com
Reviewed-by: Marc-André Lureau marcandre.lureau@redhat.com
Signed-off-by: Kostiantyn Kostiuk kkostiuk@redhat.com
Signed-off-by: Luo Yifan luoyifan_yewu@cmss.chinamobile.com