am c4231382: DO NOT MERGE Settings: Implement new required method.

* commit 'c423138247857312a4ac6ad32cb482868315bd61':
  DO NOT MERGE Settings: Implement new required method.