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

Change-Id: I6c5b41149feff78f2eda62f30c832fe56f94f666