am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev

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