Merge "Removed overlay from target" into oc-dr1-dev am: eb42aa7438 am: 2c0743601e
am: 4e5d7f3b33

Change-Id: I04e256fb2a9b5bb78a7eb07e0e3d96702e41cf55