[automerger skipped] Merge changes from topic "cleanupkeepalive" into qt-dev am: c31ccecf -s ours
am: 223535d8 -s ours
am skip reason: change_id I0481a469ee23231e5f0ab738a06b5e09f6cdb680 with SHA1 cf43dbdb is in history
Change-Id: I487ad4a020a25c1d12b6370589777685261b8af0