Merge "move assistant to system API"