Merge "Fixed wrong QS padding" into rvc-dev am: 841f253cb1 am: 4a99b9d2c7

Change-Id: I6f42ef23b4dd64b6f047eed5974d1efc49576bac