Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev