Merge "Fix odd avatar when message sender is a number" into pi-dev
am: cd5ca7e618

Change-Id: Iba352138169c6c916662230e14de62f2d8f77a87