Signed-off-by: Andy Lee <andy.lee@suse.com> (cherry picked from commit 8db4de1c4a1200f4f303e4444b6435c581187d72)