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 am: 2e10c437
Change-Id: I92d2e9c752aa6a011020a045b5cf6094c51bafc7