Replace dist-for-goals with a dist property.
am: 2a029f0799

Change-Id: Idf51e05e6b648bd91aa2794268f8fb4bac512f74