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