Amends d273076b44. Pick-to: 6.4 6.2 Change-Id: Icfff438223ed10756f15e25ea52cccdf93dd47a2 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
d273076b44