Merge branch 'distance-with-t-bug'

Change-Id: If29c13b3d4332763340dab0b6cee6138b90fbeae