More manifest changes

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