Settings: fix merge

Change-Id: If2d5996651fc2bca40363e6dc274b8ab69863f45
Settings: merge fix

Change-Id: I09bd9ae6c89007585998a80a53c5e2ff5cb8ea19