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

Change-Id: I88dfa3f00cd3b62e9dec3db29155a05c02b403f2