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

Change-Id: If4242cbe667e689662ba2323e986d35cf6c03f53