fix contacts after 4.2.2 merge

rebase

Change-Id: If780129fb56993b3d23234184b7085e57060b13a
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>