Merge changes from topic "cp-log-watchdog" into qt-qpr1-dev am: cb6ad6dc8e

Change-Id: I818c57736c63e67f24072f551e3911d958ed0532