Fix up errors in manifest.

Change-Id: Iec0c47baf15d02fd07b097c612b2f4461243b0d1