am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev

* commit '140ff7a50b826b277ea8cecbfd11df3d3eeddad4':
  Delete the user key when deleting a user.