Fix QS expansion weirdness #2

Bug: 17138703
Bug: 17047680
Change-Id: I4058d9a2e349c4a52ab167638471a1eb11753380
2 files changed