Add back in packages and stuff that was removed

Change-Id: Ibc22e135e948d64bebb6ff7e13c0504c840a9999
Merge "Add back in packages and stuff that was removed" into du-44