Bug: 154960712 Test: atest ManifestFixerTest Change-Id: I556fc11e271337de40c70d4ed56a0381a2f79712
d7dd4ad00c
cf662a4aac