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

Change-Id: I4b60f33db0cb582580f19f82f4af1bebf63a75c1