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

Change-Id: I4ba14ae69b3294031f242508e8b8a672fb240021