[automerger skipped] Merge "Update watchdog value" am: 579fb5fe58 am: 98554cf1ff -s ours am: 65592dc8be -s ours am: 774264f205 -s ours
am skip reason: Change-Id I9e4bdb3a5dd9c6b476540f3c90304657986e17c3 with SHA-1 e2642adac5 is in history
Change-Id: Ib84438e1da1dd12f21ef1c0694c8cbfd20e48dd3
This commit is contained in: