Merge "Continue to remove users when destroyUserKey fails." into nyc-dev am: f410244
am: 7cc92c6

* commit '7cc92c6d9ceef8a2183fbccb893d2a02e95fffa6':
  Continue to remove users when destroyUserKey fails.

Change-Id: I61fd008e585498a1d7ae47b3b12401e989839e47