Merge \"Round unclipped saveLayers\" into nyc-mr1-dev
am: fdef509c93

Change-Id: I815b90f2d26a9043db3c76b69c64a3b42d3369ca