Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev