Use some of my own packages

Change-Id: I09ab30bd985ed5cbdf18b899a7a43a5bc444349f