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

Change-Id: Iede184ab8942798a932f67d1ece3f7fd5e0f9d66