Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am: e8ba34a851

Change-Id: Iefe7ac373d783298f608effd81ae50b21053d69c