Fix Settings

Change-Id: I3925e5f36e5b99bce2a8f4176322bd2d40ba2ff2