AdministrationBook changes

Change-Id: Ifcbb1c56ac339c223fa419beadff49c3bee26298