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

Change-Id: Ic8d84bfc4e39f1777190e16a651e2cbf2313f8e6