Merge "Removed overlay from target" into oc-dr1-dev
am: 67afad200d

Change-Id: If5a32cc9bfa3d8116b9a69403fd7484eedf5dfe8