[automerger skipped] Merge "Update watchdog value" am: 579fb5fe am: 98554cf1 -s ours am: 65592dc8 -s ours am: 774264f2 -s ours am: 512d08f2 -s ours

am skip reason: Change-Id I9e4bdb3a5dd9c6b476540f3c90304657986e17c3 with SHA-1 e2642ada is in history

Change-Id: I6f01de43068d491acf4500c772f22c2417bef0f5