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

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