Add the lookup_key column, which should have been in the previous CL

Also added some more javadocs

Bug:5134325

Change-Id: I486b753f7cfb622e0211bb7f6bd04eb18b6e1e5b
2 files changed