am 0882fe87: am 3867ddab: Merge "merge new multiuser avatars in from proto...
am 0882fe87: am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev
* commit '0882fe87':
merge new multiuser avatars in from proto app