Merge "Allow deleting accounts when user is locked" into nyc-dev
am: f3d2414

* commit 'f3d241486b17cbfef7ad9b57aef3454ac3e0e769':
  Allow deleting accounts when user is locked

Change-Id: I06cf0ba96fcd0f7c3e13d29daa01f56b04c0e5ac