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

* commit '02dd0a36add4ccaf444849b5c5ccc74c4a740072':
  Add missing conditional in settings provider