Merge "Merge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into oc-dr1-dev am: d17d5256 am: f1ac8932" into oc-mr1-dev-plus-aosp