am a4bfc36c: (-s ours) am d5406749: am 176c878d: am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev

* commit 'a4bfc36c558643ab25c5dae1622d9b476e5dc8b4':
  DO NOT MERGE: Don't backup night mode setting