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

Change-Id: I4d01fdbffe8dd0c61c8adb9dd4c855b99dbf8ca3