Plain Diff
Conflicts: src/assistant/assistant/assistant.pro Change-Id: Ifa7d318f8482c09367388d6c9f848c4931a5ead7