Add reworked manifest bring-up

Change-Id: Id2255859e4e5cf15aa7b6b3468a8b8a06f2b17a2