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

Change-Id: I0450c4ad8e517a642cf7fea7d9302874e3229e57