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

Change-Id: I8f838899802d3a701cb6d2607dc4a75e7e429795