Merge "Use first letter of user for icons." into oc-mr1-dev am: 30f9d275e9
am: c9f6d38378

Change-Id: Ie1662263a220f0328fb5c21ebeb6ab16dffd4ba8