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

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