Merge "Fixed wrong QS padding" into rvc-dev am: 841f253c am: 4a99b9d2 am: c8eaefe2 am: 004603ab am: 6b0a9d74 Change-Id: I20a9befba5561382402e2e6b5a47f1272a03cb6c