Add manifest and fix derp

Change-Id: I60e46f986c413a7023c94322dc0e5ba01fb65c5a