[automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd am: 966c2eb20d -s ours
am: 1cf83928e5 -s ours
am skip reason: change_id I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5 with SHA1 36e2bfbaad is in history

Change-Id: I279add54ba84fd71c6b32788f14a551a31d6c779