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

Change-Id: I8654d0f68b72c7bbb9337e8e282bdd5918dbf700