Merge "Bring back transparency for QS" into oc-dr1-dev
am: d037c6ac36

Change-Id: I8313648e66b97401ce81f9188823ddb9488dcb9f