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 am: 8e503926
Change-Id: I093ea7c4ab27b8783afe504f358cad6b5922c79b