Prevent new usage of deprecated Settings class

Change-Id: I43a7f34ed1bd5be99becaad8338a3ba59f500284