[automerger skipped] Merge changes Ibb3f46b8,I875b87a0,I2d005e17 into qt-dev am: 64e64eb990
am: c745f09b33 -s ours
am skip reason: change_id Ibb3f46b8f84854ede47a669a85e07e16a5dd6008 with SHA1 b00e66f754 is in history

Change-Id: I81c8ae7f92f9bd0ba5f9c5a3d7b4aa07d4466325