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

Change-Id: Ic896c9f805330c28e9e0c3ca583f28e80bc47184