Do cleanup on PhoneBook

Change-Id: I7c6a6acae2d1dbb454b492ae06413b355a812701
CRs-Fixed: 3021467
10 files changed