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