Merge "[QS] Fix alarm text in QS header" into pi-dev am: df59556a9e
am: ccd43fde7a

Change-Id: Ib60d327476a46dc4fced91e1339b032739ac3977