Merge "Fix issue with saving admins before finishing loading. am: adbda7474c" into nyc-mr2-dev-plus-aosp