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

Change-Id: Ibb7d608f220a2d244050ee070bc63e959d56d1ec