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

Change-Id: I327a0e9f91bd8eac756a65ba6e68304c3934abfc