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

Change-Id: I6607d286a851535f8a79e56cb49eabadbf5a55ad