Add Reworked Manifest

Change-Id: I27a1424937cd57c56f9599415707098386aed51a