Merge "Clarify comment how manifests are combined."
am: ee45b5350a

Change-Id: Ia9970a2e14056adcdb54a676582d86895461310d