Update Settings

Change-Id: I7be7b16ed97714f87755fff95f276eb0f9fb94dd