Merge "Revert "Removed overlay from target"" into oc-dr1-dev
am: 8a7f2128b3

Change-Id: Ic108bd9ffcb6201671764d4dccdd6b460ad29f1e