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

Change-Id: I51c4e9f73502b1ae85b83799e86d072dc7293587