Merge changes I05aad785,I8f7d943e into qt-dev am: 4ed3e1bf4f
am: 33595116e2

Change-Id: I5dec1d08b6232a70d03fb82f2f9ec16f6d5c920c