Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev