manifest: moar changes

Change-Id: I68efdef5d7ee54cf5a0c341eab90c122d2fa7bd7