Merge "Fix rounding error related to autoSize" into pi-dev
am: 46c84bf237

Change-Id: I0c8b7c4b21d0980547025ebd58189a637020b209