Settings: update

Change-Id: I5837e92011580811ea1196ccd387233f82c3ecd7
Settings: update

Change-Id: I41ecb2a640a21873f2b27a69cd4eff65308af0f5