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

Change-Id: Iff0adac9310f836df5f75c64c17ea3c72cd940d4