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

Change-Id: I2d5552c630b8a361ec0212cb1be8c406b4f4ea4a