Merge "Adds USAGE_ASSISTANT to UsageTypeConverter" into pi-dev
am: e8c3ff270e

Change-Id: I996d3ec8e8b5ef25c325620cb95224a32de40589