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

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