Merge "Update watchdogd path" am: 2d8fb579d5
am: c2258c35ad

Change-Id: I8785499886f37446c68fc2051ed979b556bb7f36