manifest revamp

Change-Id: If1c99b96e450abe0d96baa78f5b69814fcf7099d