[automerger skipped] Merge changes I689ec523,Id249a185 into qt-dev am: a99ff5fa
am: 23f2e292 -s ours
am skip reason: change_id I689ec523522da37987cff9b1a67eaae9e5633ffb with SHA1 abfc054c is in history
Change-Id: I55df2cf2168d464fa57493bca95253f86af73741