Merge "Fixed wrong QS padding" into rvc-dev am: 841f253c am: 8983fbb7 am: 97807672 am: f9c9721b Change-Id: I6b9a530afbdef35590d3a18dcd351207b15ecdac