this is to avoid the precision issue with the coordinates DO NOT MERGE Change-Id: Icfab3fa6fd0a331aef12ee71c73bac04dc9685be