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