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
Change-Id: Id42181edba6dcf34be5d5b75be10111629a85a23