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

Change-Id: Ia518498d6b419dfa071df26dc609e51f4b101af8