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

Change-Id: I9d641bdc9d4e2c9f157d828bcf9c030f74136619