Merge "Adds USAGE_ASSISTANT to UsageTypeConverter" into pi-dev