misc admin yaml includes

Change-Id: I7a5f4bc092434392f022939585384a75e2b5ca70