am 1b5cc81c: am cc876b26: am 6ddc34e5: Merge "Allow binary value in SettingsProvider" into mnc-dev

* commit '1b5cc81c90a0d961680d8f3f6bb051708d68615f':
  Allow binary value in SettingsProvider