[automerger skipped] Merge changes from topic "clat4" into qt-dev am: 12e63f42 -s ours
am: ee75123a -s ours
am skip reason: change_id I9a18cb8b105e5c0cfdf8feff0f73c99643b0d6b6 with SHA1 4657e51d is in history
Change-Id: I7fec8106313ed130f8daf0165dd88d92dd02d8df