am 421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0

* commit '421648ed06a2c944bc6a5fa866d461761533005b':
  Backup owner info as part of settings backup. DO NOT MERGE.