Merge "Ensure QS contains at least 6 tiles." into pi-dev
am: fc45001103

Change-Id: I22e08582396ec93448166569efde52a79eda2611