Settings Updates

Change-Id: Ie6c148a2604a729d31a229d4c86977e5794cbed5