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

Change-Id: Ifde20dea1186c01ae186bc987f5ac60396ec6041