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: 58029373
Change-Id: I8de9d03d73fde897938512429a8784bb080bd926