Change-Id: I3d745b54ae3aa5c3c05c859239934125b9ca828d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>