[automerger skipped] Merge changes Id0ab90fe,I5f5c9872 into qt-dev am:...
[automerger skipped] Merge changes Id0ab90fe,I5f5c9872 into qt-dev am: bd41f3f6 am: efd30f10 -s ours
am: 2a7b9f52 -s ours
am skip reason: change_id I08689c263c4fd96363666a108ba08d768ad327df with SHA1 fcb6e6ce is in history
Change-Id: I7e79b074775f6dbc99bab69a6f1c2fd567ef85e5