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

Change-Id: I80de740d537c1e1f01103b5f22a3a892581c8ac0