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