Merge \\"On phones, don\\'t show the avatar icon when it is the only user.\\"...
Merge \\"On phones, don\\'t show the avatar icon when it is the only user.\\" into nyc-mr1-dev am: 9ee8f806
am: 2c0f1a87
Change-Id: I8689b1ae160323fb3b309c7e9b32913856fab7ef