Merge "Add a Java FindAddress implentation." am: 9ea410a6f8
am: da4e3b68fb

Change-Id: I7b2448fcb2edb4bc9000fd5e55f7295e6c6ff676