QS: Capitalize more consistently

Change-Id: Idfe152a97e639c97ac68f98d516f7646f458c31e
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Merge "QS: Capitalize more consistently" into jb-mr1

Change-Id: Ia313cb43d8853a2cbe3fa7a8d7a305ff60a49728