Unbreak manifests!

Change-Id: I692004d5cae3ba64758387eb6042830db3b92c79