fix refs to Settings class

Change-Id: Id45c16365d63be6b9f1897d29919449832e263d6
Merge "fix refs to Settings class"