Merge "Update QS customizer add tiles string." into pi-dev am: 323e41c6ae
am: a510df5035

Change-Id: I67c071e6031551db68ac09e39cbd66fb107bb22d