Merge "Expose Geometry, LatLng, and maxWaitDuration"
am: e993fb8bb9

Change-Id: Ie8332c4a2b6ee5617b4313235932645cbb4f593d