Merge "Handle CMD_DISABLE_P2P_WATCHDOG_TIMER in default state" into oc-dev
tree: b5c5b35b0766dfb6eec972ebe5e9f4137e1a0ae8
  1. service/
  2. PREUPLOAD.cfg