Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed am: 1894632864 am: c8a6eb1382
am: 7ede74bb06

Change-Id: Ifcace51e08196fdce59ebcc375136215b1e91079