Merge "Fixed wrong QS padding" into rvc-dev am: 841f253c am: 4a99b9d2 am: 7d19e11d am: e1fb8aba Change-Id: I81c1a804432e0d36e5c91e3c56e6f8e6183c5758