More changes to fix manifest

Change-Id: I4bbcfefb4d20e46683d5f7c312ab5cc74da3a563