Merge "Allow QS expansion in switch access mode." into pi-dev
am: caa429eada

Change-Id: I9282dd8321a5fb5c9149d6e4287882ae757e8620