[automerger skipped] Merge changes from topic "statsOverflow" into qt-dev am: c6433c2a -s ours
am: 9590a7e3 -s ours
am skip reason: change_id I11f42ffc83efc917ac0871a0326375031ae0a6e0 with SHA1 e846ef8a is in history
Change-Id: I17de10f0f9a63b5b99d488d9d33dca0660588912