Backport commit 875550. Don't put avatar into avatar manager if contactId is empty. CCBUG: 173136
Changed paths: