Merge "Update to allow multiple HALs in a manifest."