Merge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into oc-dr1-dev am: d17d52567b
am: f1ac893291

Change-Id: Ied30c944f0910673a6ef564c9ad096a80b1ec3e3