Merge "Tool changes to include telephonylookup.xml" am: 2958a4b838
am: d4d6910510

Change-Id: I24386b169a2c66fb90cb8f2b2dcd03c02d964231