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

Change-Id: I1cfcf0db13c8cad06d3abcdd610efbb81b61a441