This amends 84cf0e2be5 Pick-to: 6.7 6.6 6.5 Change-Id: Ia560f785764d4ba0e4aa66943effb9f16a38e699 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io>
84cf0e2be5