Merge "Set the resource values of cutout path and rect to empty string in...
Merge "Set the resource values of cutout path and rect to empty string in waterfall overlay" into rvc-dev am: 6c654013 am: 946e3471 am: a766b415
Change-Id: Ia637c8018a668e979f0a55cd6e3c478302f43970