Bring up

Update accordingly to current state

Change-Id: Ia4ce5f6d9ee4445895af4c3130402069c1c73802
Merge remote-tracking branch 'pac/pac-4.4' into pac-4.4