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

Change-Id: I59462fcffb32dbbe6c8bd04070438774e5c115c5