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

Change-Id: I02ce05a70679f20714ef7f327772fa49e886670e