Bring up

Update accordingly to current state

Change-Id: Ia4ce5f6d9ee4445895af4c3130402069c1c73802