Merge "Add avatar and small icon in bubble primary button."
am: 6eec20f5c5

Change-Id: Ic6681fc737cb5104bb01733e2682ec65058127c5