Make reverse lookup implement the phone number lookup interface (1/2)

Change-Id: I35195d6c5a89cf22ac0f31d48e2ef89102a453c1
Merge branch 'remote' into mkl