Fix ManifestMerger issues am: 5fdc24aa6c
am: c56e189220

Change-Id: I3f3c32bfb15ed7cc5f12d2076d3311073abaafb2