add packages back in preparation of framework allignment completion

Change-Id: Iaa21dd28a839b729c77ed2f3b4254371a243cadb