resolve merge conflicts of 7aeb93232830d83c0c8f65b15ca7295c78d45e0d to qt-dev am: 968f24998c am: cce2af2ac3

Change-Id: I32f1237aa13341bf724a6ce032646819ec3920d0