Merge "Merge "Revert "Removed overlay from target"" into oc-dr1-dev am: 8a7f2128b3 am: 2145739ff4" into oc-mr1-dev-plus-aosp