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

Change-Id: I135077e4e651d120571050c68994b6daf9d219d6