Merge "Reduce floating point error in PerimeterPathGuide." into qt-r1-dev
am: 8668e91463

Change-Id: Idd04ff5cba182302d67604e5939c82e3cd7dac51