Merge "Allow OTA even when ART Service is enabled." into udc-dev