Merge "Minor QS fixes" into rvc-dev am: 7004577d95 am: bb529c09c0

Change-Id: If35083f6af35f09fba15c6c218ddf7b525836651