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

Change-Id: I7ffbbeaea8d99df6a5e30298c7da2e522092f348