Merge "Not trying to remove admins already being removed" into nyc-mr1-dev am: cefcb979ae
am: 6075a5b741

Change-Id: I67df1d03192555d117752d595b5ef4157a32653e