[automerger skipped] Merge changes If5801c81,Ifd669426,I7cbe5fc1 into qt-dev
am: 52ce3686 -s ours
am skip reason: change_id If5801c81c6ef222b46f631bd6570dcd0fea465bd with SHA1 ac12b84e is in history
Change-Id: I58c4a7001a9316730bd7a3be747c4d937a3c97ac