am 7f88a2cb: (-s ours) am c1048880: (-s ours) am ffb07daa: am 0b218533: Merge "Fix for letter tile avatars not displaying properly in calllog DO NOT MERGE" into klp-dev

* commit '7f88a2cb9a004f71bf1cf4a25e19988b343d40af':