Merge "Iteration on findPath API. Address Jeff's comment in ag/1542773."