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

* commit '63690fa5b056523e2dce52fe9dc2954e92b55bca':
  Delete the user key when deleting a user.