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

Change-Id: I152858c754a1fa81aaf14952e602e66fd8b666cc