merge new multiuser avatars in from proto app

Change-Id: I6a7f63738279be1c036061b4cea461e94fb51658
10 files changed