QS if/else pt 2

Change-Id: Id9b08d1217f5c0809c649238ae73cfa7d57a1a10
Merge "QS if/else pt 2" into kk44