Settings commit to go with QS cleanup

Change-Id: Ie064d70409b1c7b58bf08048fdc349318aee76d4