Merge "Make assistant button display the icon of the role holder application"...
Merge "Make assistant button display the icon of the role holder application" into rvc-dev am: 0b1e87f8 am: 002a2702 am: ce6470c4 am: 185a6b93
Change-Id: I96254819ee92cf68450cf739e2ee0f52d20c878a