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

Change-Id: I6c4bb43752478371be8661392861251eea9076e5