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