[automerger skipped] DO NOT MERGE: Add configurable default setting for assistant componentname
am: d5bed0f4b6  -s ours

Change-Id: Ic2a4a2d452d55ec87f678c7c4573b819aa145ebf