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

Change-Id: I7340711c0d95fcded3fdeb9479f8c6521f708786