Use angle and distance from center, rather than distance from target. Change-Id: Ic970bc4b05d341dbb6aab334e3f630794f2a211c