Add more packages

Change-Id: I17d5b15ffbe51d23db205af1045d73eb320f7a26