am f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev

* commit 'f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c':
  Add missing conditional in settings provider