Merge \"Merge \\"Fix savelayer rounding\\" into nyc-mr1-dev am: 754ea612ec\" into nyc-mr1-dev-plus-aosp
am: 46813558a3

Change-Id: I6afdba716240f52cfa0beba6fb70404bf00429f8