Merge "Revert "move assistant to system API""