Manifest fixes

Change-Id: I58dad552d90b495bb4313b27cc4c5fb3e1baa004
Signed-off-by: Evan Anderson <evan1124@gmail.com>