Initial commit plus cleanup of manifest

Change-Id: Id673a400322dc0c264c12fe6b8f7321b0b64eed5