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