Hygiene: Merge Overlay and OverlayNew

Deprecate 'parent' usage

Change-Id: I1fdbe8c7bdcc6afd97d879694b5667ba513736fe
Merge "Hygiene: Merge Overlay and OverlayNew"