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

Change-Id: Icfe8e4bc8a96e6aae26dcdbb3864d0ddd5e8f3bc