[automerger skipped] Merge changes from topic "cp-log-watchdog" into...

[automerger skipped] Merge changes from topic "cp-log-watchdog" into qt-qpr1-dev am: cb6ad6dc am: 1b1b3a2d -s ours
am skip reason: Change-Id I81b55dbf9dc74c9b8d505988b99f7e97ef659fe9 with SHA-1 cf6a399e is in history

Change-Id: I00de354e63aaf6a4588298622488ff07ec8ba9cd