Merge \"Add missing roundOut for layer damage\" into nyc-dev
am: 48cde353eb

Change-Id: I99532e6b7992452523c4fb0716a7161c06b92950