[automerger skipped] Merge changes I7368f9b4,I7a6bec4f,I3eb9f7bc,I53d05702,I5cb6c9e0, ... into qt-dev am: 82ec520d
am: 84a33d79 -s ours
am skip reason: change_id I7368f9b4f3e67985f404f701e92dfe82286935be with SHA1 573b2b0c is in history
Change-Id: I98169f0252c612f1483ffc176f243e996b52fd71