Merge "Fixed wrong QS padding" into rvc-dev am: 841f253cb1 am: 8983fbb745

Change-Id: I0fbca7567b3ca3c9b9cb44d7a58f4e75ff27507a