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

Change-Id: If2720dcb6e3c376f968e454fb734f3443c5a3080