Merge "CDD:  Require OTA Resume On Reboot feature." into rvc-dev