[automerger skipped] Merge changes If5801c81,Ifd669426,I7cbe5fc1 into qt-dev am: 52ce3686f9 -s ours
am: 4d982939ea -s ours
am skip reason: change_id If5801c81c6ef222b46f631bd6570dcd0fea465bd with SHA1 ac12b84ef0 is in history

Change-Id: I46141c1a6fce7c6ddf28bce77c7f3ed510165474