Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev am: 5e2634ba55
am: c99838288a

Change-Id: I87f4bdf7becdde1b6c1e44fb3f6abab42d4319a2