Revise manifest.

Change-Id: Ia73f14c07864ac13c768f566d55dc98beeb002e3