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

Change-Id: I85115154d0c392467a0931151f628ecb205d87ad