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