am: bd61907 * commit 'bd61907ba8364508cf0a8e5cd7d26827a53db83c': Centralized user icon drawing with badges Change-Id: Ic6b26cf5329377c4cb4c7c29cd7d56cd3b58dc29
am: bd61907 * commit 'bd61907ba8364508cf0a8e5cd7d26827a53db83c': Centralized user icon drawing with badges Change-Id: Ic6b26cf5329377c4cb4c7c29cd7d56cd3b58dc29