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: Id2da371b3f82ef02142d2e14440b8992d208c802