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

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

Change-Id: Ic3fbb44439c4b654cc2e3d5898563ef2e848dc0a