Merge "Add app_api_service to device_state service type."