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

Change-Id: I8b92a18674f3422710d0112fa2c5b644fd61e779