am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev

* commit '489043d49be1ea66b7714666193e69399cffa223':
  Don't always transfer device owner status to other users.