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

Change-Id: I5a153e5c5a43bbdb7e3ace4b19ea08c08416ffa1