Merge "SF: Change rounding behavior in setGeometry" into nyc-mr1-dev
am: 6d7d099b8e

Change-Id: Id927602fb53e8043271d607855ec46f01aea53a3