Merge "QS Tweaks" into oc-dr1-dev
am: 48db7e6dcd

Change-Id: I1fe993222e111ea505d6544a8bbba84f602ec758