Merge \"Fix savelayer rounding\" into nyc-mr1-dev
am: 754ea612ec

Change-Id: Ib86ae01c824b57c4c93562aefb6c264b02538e28