am 288fe16c: Merge change 6043 into donut

Merge commit '288fe16c20e2c20556839046d38c487b0b18735c'

* commit '288fe16c20e2c20556839046d38c487b0b18735c':
  System and Secure settings backup.