Fix ManifestMerger issues am: 4543e61753
am: ba7a14b0b0

Change-Id: I1239207ab56123e8c225fa76b30809e4ffe14132