[automerger skipped] Merge "Add configurable default setting for assistant componentname" into pi-dev
am: afda78ad15  -s ours

Change-Id: I6f35d4dbe159cf34cfe541c68ff36e28d0cf1a2c